From 1d4930c3d6190c2404088716dddffa2b5a741ac9 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 28 Jun 2020 21:15:04 -0500 Subject: [PATCH] Abstract config declaration key construction --- src/pgwui_server/__init__.py | 2 +- tests/test___init__.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pgwui_server/__init__.py b/src/pgwui_server/__init__.py index 81b6800..3651a2c 100644 --- a/src/pgwui_server/__init__.py +++ b/src/pgwui_server/__init__.py @@ -214,7 +214,7 @@ def parse_component_settings(component_keys, key, settings): def validate_settings(errors, settings, components): '''Be sure all settings validate ''' - component_keys = ['pgwui.{}'.format(component) + component_keys = [plugin.component_to_key(component) for component in components] for key in settings.keys(): parse_component_settings(component_keys, key, settings) diff --git a/tests/test___init__.py b/tests/test___init__.py index a8b079a..a350099 100644 --- a/tests/test___init__.py +++ b/tests/test___init__.py @@ -64,6 +64,8 @@ mock_add_route = testing.instance_method_mock_fixture('add_route') mock_find_pgwui_components = testing.make_mock_fixture( pgwui_common.plugin, 'find_pgwui_components') +mock_component_to_key = testing.make_mock_fixture( + pgwui_common.plugin, 'component_to_key') # Unit tests @@ -361,7 +363,8 @@ mock_parse_component_settings = testing.make_mock_fixture( # validate_settings() -def test_validate_settings(mock_parse_component_settings, +def test_validate_settings(mock_component_to_key, + mock_parse_component_settings, mock_abort_on_bad_setting, mock_validate_setting_values, mock_validate_hmac): @@ -373,6 +376,8 @@ def test_validate_settings(mock_parse_component_settings, 'key2': 'value2'} components = ['pgwui_server'] + mock_component_to_key.side_effect = ['pgwui.pgwui_server'] + errors = [] pgwui_server_init.validate_settings(errors, settings, components) -- 2.34.1